From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon, 4 Jun 2012 22:46:27 +0000 (-0400)
Subject: extensionSystem: Remove the two-step initialize
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6479
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=3290bfae682c761c158c2f195c4d70cd7f505513;p=gnome-shell.git

extensionSystem: Remove the two-step initialize

Initially, extensions were loaded after they shell had fully created
the session and all objects, but this didn't allow extensions easy
ways to monkey patch prototypes, as most functions had already been
bound. Remove the historical vestigal function, and just merge the
two together.

https://bugzilla.gnome.org/show_bug.cgi?id=677586
---

diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index 35b02a482..c33162d4d 100644
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -239,12 +239,10 @@ function onEnabledExtensionsChanged() {
     enabledExtensions = newEnabledExtensions;
 }
 
-function init() {
+function loadExtensions() {
     global.settings.connect('changed::' + ENABLED_EXTENSIONS_KEY, onEnabledExtensionsChanged);
     enabledExtensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);
-}
 
-function loadExtensions() {
     let finder = new ExtensionUtils.ExtensionFinder();
     finder.connect('extension-found', function(signals, extension) {
         loadExtension(extension);
diff --git a/js/ui/main.js b/js/ui/main.js
index 35c47deb1..4248ab9cd 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -221,7 +221,6 @@ function start() {
                                                 false, -1, 1);
 
     if (sessionMode.allowExtensions) {
-        ExtensionSystem.init();
         ExtensionDownloader.init();
         ExtensionSystem.loadExtensions();
     }